Build scripts don't have .exe appended

diff --git a/tests/build-script.rs b/tests/build-script.rs
index 619838fd330ef10d988f9336f3ebf371a6062a01..cad562eb7e883e0fa2eb006d16637f19eb541a71 100644 (file)
--- a/tests/build-script.rs
+++ b/tests/build-script.rs
@@ -34,7 +34,7 @@ fn custom_build_script_failed() {
                        .with_stderr(&format!("\
 [COMPILING] foo v0.5.0 ({url})
 [RUNNING] `rustc build.rs --crate-name build_script_build --crate-type bin [..]`
-[RUNNING] `[..]build-script-build[EXE]`
+[RUNNING] `[..]build-script-build`
 [ERROR] failed to run custom build command for `foo v0.5.0 ({url})`
 process didn't exit successfully: `[..]build-script-build[..]` (exit code: 101)",
 url = p.url())));
@@ -407,7 +407,7 @@ fn only_rerun_build_script() {
                 execs().with_status(0)
                        .with_stderr("\
 [COMPILING] foo v0.5.0 (file://[..])
-[RUNNING] `[..]build-script-build[EXE]`
+[RUNNING] `[..]build-script-build`
 [RUNNING] `rustc [..] --crate-name foo [..]`
 [FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
 "));
@@ -495,7 +495,7 @@ fn testing_and_such() {
                 execs().with_status(0)
                        .with_stderr("\
 [COMPILING] foo v0.5.0 (file://[..])
-[RUNNING] `[..]build-script-build[EXE]`
+[RUNNING] `[..]build-script-build`
 [RUNNING] `rustc [..] --crate-name foo [..]`
 [RUNNING] `rustc [..] --crate-name foo [..]`
 [FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
@@ -674,7 +674,7 @@ fn build_deps_simple() {
 [RUNNING] `rustc [..] --crate-name a [..]`
 [COMPILING] foo v0.5.0 (file://[..])
 [RUNNING] `rustc build.rs [..] --extern a=[..]`
-[RUNNING] `[..]foo-[..]build-script-build[EXE]`
+[RUNNING] `[..]foo-[..]build-script-build`
 [RUNNING] `rustc [..] --crate-name foo [..]`
 [FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
 "));
@@ -764,7 +764,7 @@ fn build_cmd_with_a_build_cmd() {
 [RUNNING] `rustc [..] --crate-name b [..]`
 [COMPILING] a v0.5.0 (file://[..])
 [RUNNING] `rustc a[..]build.rs [..] --extern b=[..]`
-[RUNNING] `[..]a-[..]build-script-build[EXE]`
+[RUNNING] `[..]a-[..]build-script-build`
 [RUNNING] `rustc [..]lib.rs --crate-name a --crate-type lib -g \
     -C metadata=[..] \
     --out-dir [..]target[..]deps --emit=dep-info,link \
@@ -774,7 +774,7 @@ fn build_cmd_with_a_build_cmd() {
     -g -C metadata=[..] --out-dir [..] --emit=dep-info,link \
     -L [..]target[..]deps \
     --extern a=[..]liba[..].rlib`
-[RUNNING] `[..]foo-[..]build-script-build[EXE]`
+[RUNNING] `[..]foo-[..]build-script-build`
 [RUNNING] `rustc [..]lib.rs --crate-name foo --crate-type lib -g \
     -C metadata=[..] \
     --out-dir [..] --emit=dep-info,link \
@@ -854,7 +854,7 @@ fn output_separate_lines() {
                        .with_stderr_contains("\
 [COMPILING] foo v0.5.0 (file://[..])
 [RUNNING] `rustc build.rs [..]`
-[RUNNING] `[..]foo-[..]build-script-build[EXE]`
+[RUNNING] `[..]foo-[..]build-script-build`
 [RUNNING] `rustc [..] --crate-name foo [..] -L foo -l static=foo`
 [ERROR] could not find native static library [..]
 "));
@@ -882,7 +882,7 @@ fn output_separate_lines_new() {
                        .with_stderr_contains("\
 [COMPILING] foo v0.5.0 (file://[..])
 [RUNNING] `rustc build.rs [..]`
-[RUNNING] `[..]foo-[..]build-script-build[EXE]`
+[RUNNING] `[..]foo-[..]build-script-build`
 [RUNNING] `rustc [..] --crate-name foo [..] -L foo -l static=foo`
 [ERROR] could not find native static library [..]
 "));
@@ -1364,7 +1364,7 @@ fn cfg_test() {
                 execs().with_stderr(format!("\
 [COMPILING] foo v0.0.1 ({dir})
 [RUNNING] [..] build.rs [..]
-[RUNNING] `[..]build-script-build[EXE]`
+[RUNNING] `[..]build-script-build`
 [RUNNING] [..] --cfg foo[..]
 [RUNNING] [..] --cfg foo[..]
 [RUNNING] [..] --cfg foo[..]
@@ -1598,7 +1598,7 @@ fn flags_go_into_tests() {
                        .with_stderr("\
 [COMPILING] a v0.5.0 ([..]
 [RUNNING] `rustc a[..]build.rs [..]`
-[RUNNING] `[..]build-script-build[EXE]`
+[RUNNING] `[..]build-script-build`
 [RUNNING] `rustc a[..]src[..]lib.rs [..] -L test[..]`
 [COMPILING] b v0.5.0 ([..]
 [RUNNING] `rustc b[..]src[..]lib.rs [..] -L test[..]`
@@ -1802,7 +1802,7 @@ fn rebuild_only_on_explicit_paths() {
     assert_that(p.cargo("build").arg("-v"),
                 execs().with_status(0).with_stderr("\
 [COMPILING] a v0.5.0 ([..])
-[RUNNING] `[..]build-script-build[EXE]`
+[RUNNING] `[..]build-script-build`
 [RUNNING] `rustc src[..]lib.rs [..]`
 [FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
 "));
@@ -1816,7 +1816,7 @@ fn rebuild_only_on_explicit_paths() {
     assert_that(p.cargo("build").arg("-v"),
                 execs().with_status(0).with_stderr("\
 [COMPILING] a v0.5.0 ([..])
-[RUNNING] `[..]build-script-build[EXE]`
+[RUNNING] `[..]build-script-build`
 [RUNNING] `rustc src[..]lib.rs [..]`
 [FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
 "));
@@ -1845,7 +1845,7 @@ fn rebuild_only_on_explicit_paths() {
     assert_that(p.cargo("build").arg("-v"),
                 execs().with_status(0).with_stderr("\
 [COMPILING] a v0.5.0 ([..])
-[RUNNING] `[..]build-script-build[EXE]`
+[RUNNING] `[..]build-script-build`
 [RUNNING] `rustc src[..]lib.rs [..]`
 [FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
 "));
@@ -1856,7 +1856,7 @@ fn rebuild_only_on_explicit_paths() {
     assert_that(p.cargo("build").arg("-v"),
                 execs().with_status(0).with_stderr("\
 [COMPILING] a v0.5.0 ([..])
-[RUNNING] `[..]build-script-build[EXE]`
+[RUNNING] `[..]build-script-build`
 [RUNNING] `rustc src[..]lib.rs [..]`
 [FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
 "));

diff --git a/tests/clean.rs b/tests/clean.rs
index e7bf93fb891d820cf578887e555e2515cffc074d..c10b58b050a6af58a89ac20cbf2a8bdaee797914 100644 (file)
--- a/tests/clean.rs
+++ b/tests/clean.rs
@@ -172,7 +172,7 @@ fn build_script() {
                 execs().with_status(0).with_stderr("\
 [COMPILING] foo v0.0.1 ([..])
 [RUNNING] `rustc build.rs [..]`
-[RUNNING] `[..]build-script-build[EXE]`
+[RUNNING] `[..]build-script-build`
 [RUNNING] `rustc src[..]main.rs [..]`
 [FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
 "));

diff --git a/tests/cross-compile.rs b/tests/cross-compile.rs
index 6575e6749037f2250018825631ecc7cfc317167c..13ddec2c7fcbf88aeeb2c2eb21839b46c957c308 100644 (file)
--- a/tests/cross-compile.rs
+++ b/tests/cross-compile.rs
@@ -674,7 +674,7 @@ fn build_script_needed_for_host_and_target() {
 [RUNNING] `rustc d1[..]build.rs [..] --out-dir {dir}[..]target[..]build[..]d1-[..]`",
     dir = p.root().display()))
                        .with_stderr_contains(&format!("\
-[RUNNING] `{dir}[..]target[..]build[..]d1-[..]build-script-build[EXE]`",
+[RUNNING] `{dir}[..]target[..]build[..]d1-[..]build-script-build`",
     dir = p.root().display()))
                        .with_stderr_contains("\
 [RUNNING] `rustc d1[..]src[..]lib.rs [..]`")
@@ -800,7 +800,7 @@ fn plugin_build_script_right_arch() {
                        .with_stderr("\
 [COMPILING] foo v0.0.1 ([..])
 [RUNNING] `rustc build.rs [..]`
-[RUNNING] `[..]build-script-build[EXE]`
+[RUNNING] `[..]build-script-build`
 [RUNNING] `rustc src[..]lib.rs [..]`
 [FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
 "));
@@ -852,7 +852,7 @@ fn build_script_with_platform_specific_dependencies() {
 [RUNNING] `rustc d1[..]src[..]lib.rs [..]`
 [COMPILING] foo v0.0.1 ([..])
 [RUNNING] `rustc build.rs [..]`
-[RUNNING] `{dir}[..]target[..]build[..]foo-[..]build-script-build[EXE]`
+[RUNNING] `{dir}[..]target[..]build[..]foo-[..]build-script-build`
 [RUNNING] `rustc src[..]lib.rs [..] --target {target} [..]`
 [FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
 ", dir = p.root().display(), target = target)));